Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moves code for handling redirects and unexpected request URLs out of Theme and into more appropriate locations #8427

Merged
merged 16 commits into from
Feb 11, 2025
Merged

Moves code for handling redirects and unexpected request URLs out of Theme and into more appropriate locations #8427

merged 16 commits into from
Feb 11, 2025

Conversation

Sesquipedalian
Copy link
Member

@Sesquipedalian Sesquipedalian commented Jan 31, 2025 •
edited
Loading

Fixes #8426
Fixes #8452

9662156 will probably also help avoid issues like this perennial problem when admins inconsistently use 'www.' in some of their settings but not all.

@Sesquipedalian
Moves Theme::sslRedirect() to QueryString::sslRedirect()
18d6fc5 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Moves Theme::requireAgreement() to Forum::requireAgreement()
97fcc62 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Handles 'www' redirects in QueryString, not Theme
9662156 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Moves most of the logic in Theme::fixUrl() to Forum::fixUrl()
1d67685 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian Sesquipedalian added this to the 3.0 Alpha 3 milestone Jan 31, 2025
@Sesquipedalian
Correctly calls ErrorHandler::fatalLang for unknown actions
80c9153 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@live627
Copy link
Contributor

live627 commented Feb 3, 2025

The URL is no longer fixed when I request the page via 127.0.0.1 instead of localhost. Maybe we should ask @jdarwood007 to test aliases, too.

@Sesquipedalian
Fixes Forum::fixUrl()
8100fcd 
Ironic, isn't it?

Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Copy link
Member Author

Derp. Fixed now.

@Sesquipedalian
Copy link
Member Author

Look good to you now, @live627?

@live627
Copy link
Contributor

live627 commented Feb 8, 2025

How do I add a forum alias? A search for alias in the ACP yields nothing. Do I need to ad one manually in the database then?

@Sesquipedalian
Copy link
Member Author

How do I add a forum alias? A search for alias in the ACP yields nothing. Do I need to ad one manually in the database then?

Looks like it, yeah. It appears to be a hidden setting.

@Sesquipedalian
Merge branch 'release-3.0' into 3.0/redirects
bbed49c 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Merge branch 'release-3.0' into 3.0/redirects
c7c983f 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Fixes MIME type for XML output
e092da5 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Moves as much code as possible out of action constructors
f70e1d1 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Fixes logic order for loading actions vs initializing the theme
aaf2658 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Checks correct var in Post2::getOutputType() & Post2::isSimpleAction()
4281a8e 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian Sesquipedalian mentioned this pull request Feb 9, 2025
Closed
@Sesquipedalian
Copy link
Member Author

I have added more commits to fix #8452, because the fixes for that issue need to build on the other changes in this PR.

@Sesquipedalian
Copy link
Member Author

@Oldiesmann, can you confirm that this fixes #8452?

@Oldiesmann
Copy link
Contributor

@Oldiesmann, can you confirm that this fixes #8452?

PM previews are still broken but everything else works now. (Error from Firefox and Chrome)
image
image

@Oldiesmann
Copy link
Contributor

Previewing newsletters is also broken with the same error as above (just with a different URL)

@live627
Copy link
Contributor

live627 commented Feb 10, 2025

I set up a new virtual host (wamp server makes this very easy) pointing to SMF but none of the links change. I add a new setting forum_alias_urls with the value dev.local. Did I do it right? Am I missing something?

@Sesquipedalian
Checks correct var in PersonalMessage::getOutputType() & PersonalMess…
61a83f8 
…age::isSimpleAction()

Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Newsletter previews do not use XML output
53e3c20 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Copy link
Member Author

@Oldiesmann, those should both be fixed now.

@Sesquipedalian
Merge branch 'release-3.0' into 3.0/redirects
98d7984 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>

# Conflicts:
#	Sources/Actions/Admin/Members.php
@Sesquipedalian
Correctly handles forum_alias_urls values without schemes
fb8e4d2 
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
@Sesquipedalian
Copy link
Member Author

I set up a new virtual host (wamp server makes this very easy) pointing to SMF but none of the links change. I add a new setting forum_alias_urls with the value dev.local. Did I do it right? Am I missing something?

Try now. I tweaked that code to be a bit smarter when I moved it, but in the process I forgot to consider the possibility that the values in that array might be just naked domain names or schemeless URLs.

@Oldiesmann
Copy link
Contributor

@Oldiesmann, those should both be fixed now.

  • I'll test when I get home tonight and let you know

@live627
Copy link
Contributor

live627 commented Feb 10, 2025 via email

live627
live627 approved these changes Feb 10, 2025
View reviewed changes
Copy link
Contributor

@live627 live627 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it works now

@Sesquipedalian Sesquipedalian merged commit 051b860 into SimpleMachines:release-3.0 Feb 11, 2025
6 checks passed
@Sesquipedalian Sesquipedalian deleted the 3.0/redirects branch February 11, 2025 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@live627 live627 live627 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.0 Alpha 3
3 participants
@Sesquipedalian @live627 @Oldiesmann